Skip to content

[boost-modular-build-helper] Support Clang '--target=<value>' syntax to enable Android builds#10285

Merged
ras0219-msft merged 3 commits intomicrosoft:masterfrom
mschofie:mschofie/10091-android-boost
Apr 24, 2020
Merged

[boost-modular-build-helper] Support Clang '--target=<value>' syntax to enable Android builds#10285
ras0219-msft merged 3 commits intomicrosoft:masterfrom
mschofie:mschofie/10091-android-boost

Conversation

@mschofie
Copy link
Member

@mschofie mschofie commented Mar 2, 2020

Describe the pull request
boost-modular-build-helper builds a CXXFLAGS variable (containing user-config.jam compiler command-line options) to pass to b2. When CMAKE_CXX_COMPILER_TARGET is specified (which it is for Android builds) then the CXXFLAGS value is appended with <compileflags>${CMAKE_CXX_COMPILE_OPTIONS_TARGET} <compileflags>${CMAKE_CXX_COMPILER_TARGET}, which is correct for gcc's command-line options. But Clang expects no space between ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} and ${CMAKE_CXX_COMPILER_TARGET}. In order to build for Clang this PR adds a CMAKE_CXX_COMPILER_ID check for Clang and composes the variables in the Clang-specific manner.

  • What does your PR fix? Fixes issue boost-exception:x64-android build failure #10091

  • Which triplets are supported/not supported? Have you updated the CI baseline? There aren't any 'android' triplets at the minute. I've buddy built this change locally successfully using Android NDK 20.1.5948994 and 21.0.6113669 on Windows.

  • Does your PR follow the maintainer guide? Yes.

@JackBoosY
Copy link
Contributor

JackBoosY commented Mar 3, 2020

Regression is not related to the modification of the current PR, and I will be retested after the merger of #10290.

@JackBoosY
Copy link
Contributor

/azp run

@mschofie mschofie marked this pull request as ready for review March 4, 2020 07:00
Copy link
Contributor

@JackBoosY JackBoosY left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update port boost-modular-build-helper version info?
See documentation.

@JackBoosY
Copy link
Contributor

Will rerun linux PR test after osg-qt issue resolve.

@dan-shaw
Copy link
Contributor

/azp run

1 similar comment
@JackBoosY
Copy link
Contributor

/azp run

@JackBoosY
Copy link
Contributor

Some x64-windows-static regressions are same with #10486.
I suspect it is a problem with the ci test.

@JackBoosY
Copy link
Contributor

/azp run

@JackBoosY
Copy link
Contributor

/azp run

@JackBoosY JackBoosY added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Apr 15, 2020
@ras0219-msft ras0219-msft merged commit 3ae3c41 into microsoft:master Apr 24, 2020
@ras0219-msft
Copy link
Contributor

This LGTM, thanks for the PR!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants